auto merge of #323 : alexcrichton/cargo/issue-314, r=wycats
authorbors <bors@rust-lang.org>
Mon, 4 Aug 2014 20:59:32 +0000 (20:59 +0000)
committerbors <bors@rust-lang.org>
Mon, 4 Aug 2014 20:59:32 +0000 (20:59 +0000)
commitf23dc502fe52893e7ec90632670297c91aac5161
treeae528a79e956cbd88a7cbe1d278e50a30657aaf1
parent98bc7730940903c679fbd648531287ce9c207c73
parent2f2769b4e239964e7f88c2cd8746ac3b1925df9c
auto merge of #323 : alexcrichton/cargo/issue-314, r=wycats

Closes #314